Settings Changes and Fixes (Beta)